Fix some of Lab1 problems