Fixed issues from Lab 1