Fixing frame buster and other minor changes