Little tweak fixes