Handle more special cases