Minor fixes everywhere, - action and dev