Minor fixes thanks to @MygodStudio