Fixes for GAE detection