Addressed App Engine compatibility issues