Finished the last_* renameing and fixed a cast..