Added aditional fixes