fixing few missing things