Small bug fixes for 14.06 launch