Fix multiple issues with comparing builtin objects