Minor fixes

Fixed RequireJS update
Fixed Messages usage
Fixed functions