Fixed all toJSON non-calls