Add some edge case methods