Added changes in kaosat/dev. Fixes