Minor bug / syntax fixes.