Locked down some edge cases