Checking in more fixes