Fixes before putting this thing live everywhere