Oceanic - fix various minor bugs