EXPERIMENTAL: Small improvements here and there