Handle some user/sr edge cases; v0.4.1