First pass of opacity fixing for #5