Small fixes for compiling with Apache Lounge binaries