fixed 2 issues

these were just problems brought on by the merges from the last few days