Fix initial bugs