20131227-04: Some bugs fixed