Fix things reported by travis and thinkofdeath