Ammending more fixes