Bug fixes


[zombify_post]