Fixed more lint issues....