Small fixes and Device Control