[core] Fix issues caused by a1fd1dc

Closes #438, closes #436.
Merge remote-tracking branch 'embolia/master' into nache_dev