more init fixins