Fixes and efficiency