More instrument control fixes