Bug fixes;