Submodule troubles should be fixed...