Small fixes to ensure it works with libanius-android