non critical fixes (better memory handling)