Adding fixes for 14.04