Final bugs resolved