Bug fixes on live system