small fixes after magic :)