Fixes for efficiency