Bug fixes: 01,04,08