Fix issues on live site