Minor corner case issues halfway resolved