small fixes for now