Fixed some more boundary conditions