Correct issues reported by the module registration process.

Signed-off-by: Nigel Cunningham <nigel@nigelcunningham.com.au>