Build & travis fixes