HipHop improvements: