Little tweaks
Various fixes