Engine: minor changes for User/Org since using app's models