* More small fixes