Castle Fixes