Minor code style fixes, Travis build error fix