Fix some issues from Charlotte