small set of code fixing