Minor fixes after resolving cycles between java packages in motech