Fixes courtesy of @ironsidevsquincy