Field services bugs fixed