few more template tweaks from bugs during usage

Signed-off-by: Kyle Rockman <kyle.rockman@mac.com>