Fixed recent bug reports