Fixed errors

Still needs fixes to "custom"