Bug Fixes on ClipsController