Fixing issues from last push!