More fixes for the cylinder bill-boarding