Fixes to devassistant by jkoncick