Trying some small fixes