Fixed some issues from the last push