Some compilation buffer changes