Fixing coffesctipt errors