A few small fixes...

... to issues I discovered while converting a project from the official SW SDK.