Minor fixes, thanks @si14 ;)