Feature Movie - Fixes