Minor Bug Changes & Fixes