Small fixes

Sorry about not being super active these last couple of days