Catch up last lighttpd fixes