(WCM-764) Removed hardcoded authentication checks, minor fixes