Last fixes before starting CeIASM work

Fixes #44, #48.