Bug fixes and preparing for operational configuration