Consistency changes
Updated build