Fix intial bugs