Fixes for Gallery 4 Theme