Fixed more mouse interaction... once and for all?