Some fixes

Try to get working the module under ZIK 135.