Small fixes

sorry, accidentally put this in upstream instead of origin