Few logical tweaks/fixes