Making everything work a little nicer