Some more bug/stability fixes