Minor changes from renfbt