fixes for oic, new panels