Basic make-it-work fixes