Fix/performance tweaks