Fixes #862/#863 - Image carousel bugs