Minor fixes for new software arch