Subproject fixes

Wasn't aware of the issue. Will look into it.