Fix minor inconsistencies in code