Fixing errors..