Added some small fixes