Various Fixes by Arco