Added some missing modules compared to buildthat.