Fixed bugs where some places would be wrong