Minor fixes and tunnings