Squashing bugs, primarily around date and image generation