Build systems strike again

Half-assed commits