even more fixes for MCA device!