Fixed compile errors due to the latest glue/frbdk