Stabilty fixes: methods mismatches and some other minor stuff