More lint problems fixed