More minor/minimum fixes