badass: Some modifications and fixes for omap
badass: Fix compile error