Fix nullpointer on hyperdrive, fix icon stutter from drill.