Minor semantic fixes
v0.9.51