Fix a few issues and start getting combustion ready