Various small changes :)