Problem Set fixes