Cleaned up fixes