Compile issues from previous commits