Fixing Sammy's bugs