Some changes to pass Travis tests