Small Changes/Fixes