fixes for lint and compile warnings