Fixing other alpha related issues