Fixes, logging etc.