Basic functionality fixes