Minor changes and debug config excluded