A few issues solved.