Minor bug fixes

Callbacks, display etc