Bug fixes, hot plug revised