Fixed app engine support