Quick bug fixes