Code changes to satisfy Travis build