[BUG] Random Bug Fixes