Some small fixes for problems