Tweak method ordering for better consistency