Take 2 on API instrux tweaks