castling fixes