Fixed some lint warning/errors