Minor changes, this is to get devel

Author: @akshoop