Bugs fixed for live site