Small amount of clean-ups and fixes