Fixed omap and other tweaks