Bug fixes for multiple controller support

Bug fixes based on garbears comments