Update Apache project versions, update workarounds