Fix corner issues