Cleanup of warnings and moving of jline code