Logic fixes for best shapes