fix master
Master fix

Master is now upto date. Make sure all fixes are correct before pushing
in the future.