Fixed some cross-platform build problems
More AWS functionality