Small fixes: Set default value etc.