Fixed a few issues with opacity