Some fix on startup