Small tweaks

@idurli @radius314