Fixed issues detected on on-site testing.