user_sync fixes
Misc resource-fs/user_sync fixes