Fancy resultset and Auth fixes