Fix problems on aws