init: minor improvements