fw: minor fixes