Fixing errors partial