stack fixes