Fixes to carousel
Ant build stuff