ELEVATED: Minor Bugs Fixed

Some minor bugs fixed.