Fixed some inconsistencies caused by source control mess