Small fixes & clean-up