Maybe few performance fixes...