Minor fixes and sumodules update.