User Helpers General Fixes