Small Fixes & Improvements