Feature/fix misc