Fixed a few things when coming from web