General tweaks and improvments