Fixed some inconsistencies from first commit