Fix few bugs you know