Some more fixes for efficiency