Small Fixes

Fix some small issues which are found during review.