Some tweaks of boundary conditions